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

Change-Id: Ib4fc571fde9155f8c4de5341213e3952286057ab