Merge "Allow SystemUIDialog.Factory to create with context from client" into main