Merge "Initialize the focus properly" into rvc-qpr-dev