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