Merge "Use the correct user context in CustomTile" into rvc-dev