Merge "Polish some behaviors of the battery saver schedule screen"