Merge "Roll back qs_theme parent" into qt-dev
am: 935147be70

Change-Id: Ia548d626981097b8f06800831200b0f862428cfb