Merge "Extract and fix logic for showing rac dialog." into 24D1-dev