Merge "Make sure the next case started after previous case finished" into lollipop-cts-dev