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