Merge "Implement killswitch mechanism for Android CT" into main