Merge "[Flexiglass] Hide carousel based on lock screen setting" into main