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

Change-Id: I85255edb9f99f69a173555d8bd7e5b3bef179e83