Merge "Fix pointer location would be truncated by nav bar" into rvc-dev am: 72c28d88 am: a6d22b50 Change-Id: I024049a5b919e37cfbda408375cb58f6d771468c