am 3ac982d9: Merge "Use the view size and scale type to restrict NIV requests."

* commit '3ac982d9455cb18d1c9ca10e695770d72fe21c90':
  Use the view size and scale type to restrict NIV requests.