Merge "add asset for new tab button" into honeycomb-mr1