Merge "Consolidate wake-screen settings page"