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