Merge "Fix touch target for settings icon" into mnc-dev