Merge "Consolidate wake-screen settings"