Merge "Refactor of LargeScreenUtils.shouldUseLargeScreenShadeHeader" into main