Merge "Remove duplicate OnGlobalFocusChangeListener" into rvc-qpr-dev