Merge "Fix settings overdraw" into mnc-dev