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