Merge "Fix issue of the empty view is shown too early in PhotoPicker" into sc-mainline-prod