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

Change-Id: Iab17bfe188f3e2a1a4ad5b5d4053036a8de6600f