1d13c0bf13
=> Extending on previous CL to separate multiple translation properties and avoiding expensive layout pass Test: manual Change-Id: I058da7367fb320b9f432bef9482be2966d3a7d42