Merge "Fix voice access issue on home page"