Merge "DO NOT MERGE Make fixes to make sysui more customizable" into qt-qpr1-dev