Merge "Remove emulator specific code around STAY_ON_WHILE_PLUGGED_IN" into main