Merge "Handle case that settings string is JSON" into qt-r1-dev