Merge remote-tracking branch 'origin/master'
Removed sync intent, trying sync with background service in my own branch until it works