Merge "Reorder notification settings" into qt-dev
am: 1abcbaa093

Change-Id: I0e6baba13bfeeee2bdb78b1eeb68f484e5c94b78