Merge "Add a delay between the photo picker and the crop UI." into tm-dev