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