Merge "Do not queue trivial buffer for unsupported screenshot request." into nyc-dev