Merge "stagefright: detect output format changes without event" into nyc-dev