Merge "Add key for StorageDashboardFragment" into sc-dev