Merge "Add feature flag for lock screen."