Merge "Apply policy transparency to "Stay awake" in Development settings." into nyc-dev