Apply patch: Some code clean up
merge ps_content_handler and ps_create_request_context together