Merge "Fix restore of actionView state in NavigationView" into nyc-support-25.2-dev
am: 422afcdaee

Change-Id: I7d29a0cba2a3aacbfb0d190a7dc125e5a2096a72