Merge "Set persist.sys.theme based on darktheme" into qt-dev