Merge "KeyguardIndication: Allow no message as long as there's an icon" into sc-dev