Merge "[ctxpopup] merge related job, mainly remove invalid indentation"