Fix the tests for the entry point dialog

Change-Id: I3f56bb5842b74dc6cfcd6a8c086125004d06554d
Merge "Fix the tests for the entry point dialog"