Merge "Add TaskbarView as a child of Hotseat" into sc-dev