Merge "Remove atraces from RemeasuringLinearLayout" into tm-qpr-dev