Merge "Change name of setShouldScreenCallFurther"
am: cebf791676

Change-Id: I91bfb2d0d6658ba02a423835f709e4a892a254db