Bug 896917 - Visual polish and behavior completed
Merge pull request #11968 from lodr/bug-896917

Bug 896917 - Visual polish and behavior completed
r=jmcf