Merge "Shrink button ripple on QS btns to 36dp" into nyc-dev