Merge "Fix b/77867175: Clear all of NavigationPanel is missing" into pi-dev