Merge "init: Gracefully handle missing browser" into stable-2.6