Merge "Fix app icon size" into mnc-dev