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

Change-Id: I119fd195425793626f9cba5fc85d43ea34169a85