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