Merge "Fix QS battery tile state" into nyc-dev