Merge "Use SystemUiContext for immersive mode cling." into oc-dr1-dev