Merge "Notification settings cog button ripple under notification" into sc-dev