Merge "Custom haptic composition for assistant launched via button." into sc-dev