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

Change-Id: Ie4fb6ac88412dd0925162a74b999252b03d38ff5