Merge "Switch sysui to updated mockito target"