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

Change-Id: I2f84cc758efc3e8de5912cad39ec16454683a2a3