Merge "Increase screenshot button tap targets to 48dp" into rvc-dev am: ec4e1edb6d

Change-Id: If09fdb84b7efa7aea040502dff0d0a08d8030ea5