Merge "Reorder "on the lock screen" options." into oc-mr1-dev