Merge "Use activity from the same task when closing the camera." into main