Merge "Workaround to ensure that PIP activities have a visible shadow." into oc-dev