Merge "Use myUserId() only in registerContentObserver()" into jb-mr1-dev