Revert "Revert "OMS: block until settings are persisted""

This reverts commit b8c651c9a876491b45753e364fdd9b2a677b927c.

Change-Id: Ie02ddd3710395c3c53ca3604076c5f34c73b8387
1 file changed