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