Merge "Fix battery icon showing in QQS when it shouldn't"