Merge "Fix restore of actionView state in NavigationView" into nyc-support-25.2-dev