Merge "Handle dark themes in permissions UI" into mnc-dev