Merge "Revert "Suppress immersive mode cling in LockTask mode.""