BugId-99469: Fixes for HubsV2 mobile version