Correct development shortcut and double tap to sleep summaries

Change-Id: Ia776d25c8f58789c3eedf16b7d5c705b04130b5f
Merge branch 'L' of github.com:SimpleAOSP-Lollipop/platform_packages_apps_Settings into L