Merge "Enable EXCLUDE_CAPTION_FROM_APP_BOUNDS in devoptions" into main