Merge "Clean-up displayed-bounds" into rvc-dev am: 2556dbf3 am: b21ebd20 am: ed32893a am: 2a8a2c13 Change-Id: I76f3577d0bed41f93f6c643f24b477165be8d9ef