Merge "Align 3 button nav with hotseat" into sc-v2-dev