Merge "Show date + alarm icon when on lock screen" into oc-dev