Merge changes Ibc9d5374,I28a14ab9 into tm-qpr-dev

* changes:
  Fix parental control dialog
  Fix NPE in QSSecurityFooterUtils