Merge "QS icon sizes should be 24dp." into mnc-dev