Merge \"Change swap chain stuffed detection logic\" into nyc-mr1-dev
am: 433a19e8bf

Change-Id: I6942a7cef5c831a1be3ee0252c2f475594f3db39