Merge "Don't use shadow on app name" into mnc-dev