Merge "Correct the bound if it's from outside of screen am: a67e14a6 am: 86e825ac am: 8e39335c" into rvc-qpr-dev-plus-aosp