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

Change-Id: I5587461a9aa1b8d1df942d113a77a4f647aa0da0