Merge "Update the rich content UI to meet the UX design version 2."