Merge "Reorder home settings Bug: 62957388" into ub-launcher3-dorval-polish
am: 32a1e2cd48

Change-Id: I57dfd01b4b1d50d2e71fc66148c5b6daed00b471