Merge "Replace synchronous calls to shared prefs with async calls." into qt-dev am: 61240f6c5a
am: 98d9a61b0c

Change-Id: Ie27fc99a02c81726ca56d6cce7861584525dde08