Merge "Move bindService/unbindService calls to background thread" into main