Merge "Minor tweak, defer building PiP notification until after transition ends" into oc-dev
am: 46853ab04f

Change-Id: Ie9f3f59263b9672294de10a2500abb69d3878135