Merge "add framework for blocking user interaction"