Merge "Change name of setShouldScreenCallFurther" am: cebf791676
am: f481042f47

Change-Id: I7e05754dbc0497f5960c37b8a9c47c5f51b70340