Fix inputRichText 'full' toolbar issue
Merging origin/john/master-pending-inputRichText into master