Merge "Remove allocation in onLayout"