Merge "Fixing issue with screenshot icon being stretched." into mnc-dev