On show focus fixes
Merge branch 'development' into font-icons