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

Change-Id: I162b58ae940b49b6de385fab1e8f1b8ce28d9840