Merge "Fix restricted fragment dialogs" into pi-dev am: dbe38b09cf
am: c1b16f62ad

Change-Id: I32ec3d32e067f03f63335292c7541253bfe372ff