Merge "Add a flicker test to verify split-task transition after unlocking" into udc-dev