Merge "Revert^2 "Check and `speed` compile System UI on boot."" into tm-dev