Merge "Fix layout of DoubleLineTileLayout" into rvc-dev