Merge "Revert "Support multiple alignment within one ViewHolder"" into lmp-mr1-ub-dev