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

Change-Id: I07ff4ce93022c681b327b1dbb8a03893471b752e