Merge "Add persist.sys.theme." into qt-dev