Merge "Write a CTS test to verify shouldOverrideUrlLoading" into klp-dev