Stop non-PassivationCapable beans breaking ContextualStorage (#15243)

Change-Id: Ibbcd930a52675ea1983ab38c027692a6f6758144