Merge "Don't log error on acceptChanges() called without any pending changes" into tm-dev