Merge "Fix issue with non-focusable PiP activities being resumed." into oc-dev am: 68cf1b8848
am: 8561894fa9

Change-Id: Ib006ed2cb24e7b206a5cce0891f1dbd0476d7cde