Merge "Make system Dialog Activities theme friendly and support dark theme"