Merge "Fix multiple bugs related with DetailsFragment:" into nyc-support-25.4-dev