configuration: #2738 fixed: double flush at startup

Signed-off-by: Rafał Malinowski <rafal.przemyslaw.malinowski@gmail.com>
misc: ChangeNotifierLock stores reference instead of pointer

Signed-off-by: Rafał Malinowski <rafal.przemyslaw.malinowski@gmail.com>