Merge "Fix 3463772: Bring back alarm icon on LockScreen"