clear out notify custom component before re-render
Merge remote-tracking branch 'XTUPLE/master'
Issue #21500: Fixed issues with text overlapping picker icons
merged changes
Merge pull request #906 from lynnaloo/21500

Issue #21500 - fixed issues with picker text overlapping icons