Merge "Keep the intent resolver button bar stuck to the bottom." into rvc-dev