Merge "Update auto rotate / portrait QS icon" into oc-dr1-dev