Merge changes from topic "security_fix_settings" into oc-dev

* changes:
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c21 skipped: ed126b5d skipped: 0b52ca46
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c21 skipped: ed126b5d
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c21
  Do not allow draw on top for App notification settings