Merge "DO NOT MERGE: Change simulateUserInteraction to correct behavior with large timeouts" into pie-cts-dev