Merge "fix charger test to properly turn screen off"