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

Change-Id: I31ed361998a6824a54af7ba27c503263fdcc6e1e