Merge "Fix QS loading animation" into oc-mr1-dev