Merge "Add UiBlocker for DashboardFragment"