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

Change-Id: Ic58e8010f52e1665b21fc99b90c4cffd1374b5db