Merge "Camera2: Update focus distance related tags"