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