Merge "charger: support screen rotation"