Merge "Renamed config_dozeAfterScreenOff" into pi-dev