Merge "Workaround SysUI crash with incorrect Context for Theme."