Merge "Ensure profile-specific PiP notification is shown." into oc-mr1-dev
am: 66f2d56556

Change-Id: I9145bce7131e695a696e50b3e46e5c4a30a8e669