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

Change-Id: I62b4ddb74ee6eacbd4124da1db407c502960e0fd