Merge "Fix QS shadow disappearing on expand." into oc-dev