Merge "Fixing font scale in WindowManagerService. There was a bug that causes WindowManagerService to lose the fontScale setting."