Merge "Revert "Add multi-user support for AutoTileManager"" into rvc-dev