Merge "Change the access of cellX/Y of CellLayoutLayoutParams to private" into tm-qpr-dev