Merge "Block longer then timeout if first frame not drawn" into main