Merge "storageproxy: set a property when secure storage becomes rw" into main