Merge changes I0a2aa9bf,If3e83bbe

* changes:
  Wait longer for winscope_status to be ready
  Update flicker Region import to reflect package change