Merge "Store shortcut action on rotation"