Merge change Ibe023c8a into eclair

* changes:
  Fix Safety Settings screen bugs - 2150942, 2151440, 2151727