Merge "Make footer button tap target 48dp tall" into sc-qpr1-dev