Merge "Eliminate custom alpha handling in CellLayout"