Merge "Fix testGo_exitAction on API Level 23 and above"