Merge "Fix MultiDisplayAutoHideControllerStoreTest" into main