Merge changes from topic "ContextAPI"

* changes:
  Revert registerReceiver change until bug fixed
  replace hidden Context APIs