Merge "Update bounds on shelf/ime adjustment during transition" into rvc-dev