Merge "Revert "Introduce Intent#prepareToEnterSystemServer()"" into main