Merge "Fix the Chrome app crash in emulator issue"