Merge "Adding the ability to scale the hotseat or items in the hotseat" into jb-mr1-dev