Revert "re order buld fix"

This reverts commit 1b2e29577309cfd08972370a52caf7de166b6b45.
Revert "fix typo"

This reverts commit 3a1dba51c156dd2cafb2fd64a90a4c62313f7bc3.
Revert "fix typo : -> ;"

This reverts commit 07d9bb01dd572d7fa67c9e03bfc0a616ab838ca3.
Revert "clear conflicts"

This reverts commit b1cfb8a3838ce5a0d95e34407c3bd123174a6f8b.
Revert "Better expose 'QS Tiles and layout' function"

This reverts commit 7f79a95301fae56328fd9d9123e82fde2a6ed8dd.