Merge "Prevent tapjacking on the packageinstaller Ok button"