Merge "Do not allow draw on top for App notification settings"