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

Change-Id: I23b0c0cc6a88ec8a36c575c3389d321a65f0cc56