Merge "Do not allow draw on top for App notification settings" into oc-dev
am: 811229a2fd

Change-Id: Ie5ed40b8f573b974850234987bacc5ae7db925a4