Merge "Fix default logo is wrong for some apps." into main