Merge "Ensure app label properly bolded" into nyc-dev