Merge "Change the alignment of the foreground preferernce controller" into tm-dev