Merge "Remove DecorCaptionView and CAPTION_ON_SHELL flag" into main