Merge "DO NOT MERGE Adjust window focusable by view controller" into rvc-qpr-dev