Merge "Robolectric Mass Migration: statusbar tests" into main