Merge "Fix 6592932: add means to replace assist icon from given package" into jb-dev