Merge "Revert "Revert "Support immersive mode with task bar""" into sc-v2-dev