Merge "Moving hotseat and qsb gradients up a level. (Bug 6406475)" into jb-dev