This reverts commit 3b423157. Reason for revert: Parent change causing breakage in QSPanel. Change-Id: I5630fc05c4e0955ffc5f8cb9d23766e65c3dea8a