Merge "Improve RTL support for Immersive mode" into klp-dev