Merge "Polish hotseat and taskbar with 3 buttons" into tm-qpr-dev