Merge "Add logging upon failure to edit SystemSettings" into qt-qpr1-dev