am 4ff1516c: Merge "Revert "Support multiple alignment within one ViewHolder"" into lmp-mr1-ub-dev

* commit '4ff1516c6860afc1b4b8ee57ee98274f30e01ed4':
  Revert "Support multiple alignment within one ViewHolder"