Merge "Restricted switch preference uses ripple on focus"