Merge "Revert notification haptics to previous patterns" into sc-dev