Merge pull request #1521 from jlipps/master

keep track of 'dumpsys window' logs for research (fix #1401)
ensure ios flicks don't return control too soon (fix#742)