Merge "Add charger related property contexts"