Merge "Fix for apps that forget to use widevine:// urls" into lmp-mr1-dev