Merge "Update flyout post fontScale change"