[#47980413] Fixed a few issues
Merge remote-tracking branch 'origin/master'
[#48656383] Finished the desktop view of the tabs.