am 21f492b7: am cfd48d77: Merge "Rebuild quick settings tile layouts." into jb-mr2-dev

* commit '21f492b76a019828a3ff9785641c92dd548fed98':
  Rebuild quick settings tile layouts.