Merge "Keep the intent resolver button bar stuck to the bottom." into rvc-dev...
Merge "Keep the intent resolver button bar stuck to the bottom." into rvc-dev am: 1ef9f259 am: b1f1b2fe am: 3e354143
Change-Id: I5b73b1f4793574a77ce8b8a57fc0607754f82e0f