Merge "GuidedAction: Add save/restore support" into nyc-dev