Merge "Removing old tab assets." into jb-dev