Merge "aboot: add support for charger screen enable/disable"