Merge "charger: fix secondary display not turning off after first display was off"