Merge "Remove onGlobalLayoutListener reference when detached" into rvc-qpr-dev