Merge "No longer disable notification lights when screen turns on"