Merge "Fix requiresCharging false value ignored issue"