Merge "Change swap chain stuffed detection logic" into nyc-mr1-dev