Merge changes Ib0328f03,Ic10efc63

* changes:
  Add restrict and unrestrict dialog
  Add app restrict tip and detector