Merge "Fix QS loading animation" into oc-mr1-dev
am: d1a012fadf

Change-Id: If03bbce92e4773b5f8b7ae6d43a2d112e26fe876