Merge "Merge "Remove allocation from HeaderTileLayout#onLayout" into qt-dev am: aeb929a3" into qt-dev-plus-aosp