Merge "Turn screen off while charging"