Merge "Merge "Fix obscured touchable region code." into rvc-dev am: c22af6e7 am: a01e94e4 am: ae863afc" into rvc-qpr-dev-plus-aosp