Merge "Ignore new vibrations for ongoing alarm vibrations" into sc-dev