Merge "Enable immersive indicator by default" into sc-dev