Merge "Add timeout when waiting for HW vsync" into jb-mr1-dev