Merge "Fix for Bug 403: Install button does not work correctly first time if flow...