Merge "Removed redundant launcher icon reference." into jb-mr2-dev