Merge changes from topic "security_fix_settings" into oc-dev

* changes:
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d932857 skipped: e537ffec skipped: 8f70c24f skipped: 188904e6 skipped: ceb1ed0a
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d932857 skipped: e537ffec skipped: 8f70c24f skipped: 188904e6
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d932857 skipped: e537ffec skipped: 8f70c24f
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d932857 skipped: e537ffec
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d932857
  Do not allow draw on top for App notification settings