Reorder status bar settings

Change-Id: Ia171622a81f107e65d9cf2bf3d29f9456578c55c