Merge changes Id8f0ceab,Ie969311c

* changes:
  Refactor property-watch optout logic
  Do init_profile_extras constructor tasks only once