Merge "Update bounds on shelf/ime adjustment during transition" into rvc-dev am: 5b8c53ff am: 6434c8ca am: 45c36300 Change-Id: I78f21fef0ef4aa58409b6a06d7c8b4d950f47444