Merge "Various fixes for popup monkey testing"