UI-576: Fixed the way we dynamically load the favicon
Merge remote-tracking branch 'origin/master'