[automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e skipped: ed126b5d96 skipped: 0b52ca4693

Change-Id: I45fe88086caf9220b67162863828d3bf0ea30d7f