Merge "Several preferences lost during P->Q B&R" into qt-r1-dev am: 10eaa7adda
am: b6a413ce94

Change-Id: I0cdefcd6480760a1affe1395574cddbc8619eee1