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 am: 7b296820
Change-Id: I1f1818915fb13e910432e737f826813d0a87b890