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

Change-Id: I4a5c4c455ebf5f11a1f5dbf868aa2df28f0abeb7