Merge changes If241e329,Ib69b6987 into mnc-dev

* changes:
  Clarify docs on registerContentObserver.
  Add missing docs to StateSet.