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