Merge changes from topic "revert-1507500-oms-transactional-api-UQLIXJBEPB"

* changes:
  Revert "OverlayDeviceTests: add missing TEST_MAPPING"
  Revert "OMS: replace OMSImpl.OverlayChangeListener with return v..."
  Revert "OMS: block until settings are persisted"