Merge "Ensure device unlocked for screenshot tests." into tm-dev