Merge "Merge "Revert "Restore support for source hint rect"" into rvc-dev am: 611e7a484a am: 93828f1373 am: 84d63972c9" into rvc-qpr-dev-plus-aosp