Merge "Fix browser NPE when ChangeCache is incomplete"