Merge "[Merge conflict resolved] [Naviframe, Search, Progressbar]: GUIv1.5 changes...