Merge "Browser: add wap2estore feature"