Merge "Change font style for app entity layout"