Quick tiles row option (1/2) fix

Change-Id: Ib7642a1ee4c6b48fafaec010715403fa78c8d9eb
framework: fix merge error

Change-Id: Id58ea4e9f4a78f181a50e4ef82f189351e43aaab