Merge "Fix car notification click issue for os test case"