Merge Chrome packaged app branch.