Merge "Separate background from ripple for better focus/press UX" into lmp-dev