Merge "installer: Code augmentation in wfInstallerMain function"