Merge "Correct font size for notifications & control panel." into honeycomb