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

Change-Id: Idf32c2cdec47421386a0a41f431659059871adf5