[automerger skipped] Merge "Do not allow draw on top for App notification settings" into pi-dev
am: 4d01717c -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a5 is in history
Change-Id: Ifb49814e6f18d000aafb89652ce26e5469ef0fb5