Merge "log more settings actions" into mnc-dev