Merge "Change TestActivity to not be immersive" into main