Merge "Fixing a few accessibility issues." into mnc-dev