Merge "Prevent optimization of common code between framework/sysui" into tm-dev