Merge "Fix no action in Settings storage"