Merge "Supporting dark mode in SuspendedAppActivity" into rvc-dev