Merge "Add logging upon failure to edit SystemSettings" into qt-qpr1-dev am: 5895c90fe2

Change-Id: I4ed0188904848f022067a38cd99d06e542881847