Merge "Use context from SystemUiDialog to fix button style." into 24D1-dev