Move AICP settings just below Themes

Change-Id: Ic159314ec14e656de2d907c6836136055a95c8ad