Merge "Improve SystemUIOverlayWindow control" into rvc-qpr-dev