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

Change-Id: I310c084a950d5a7556eff46e13a3bc549d1f0d32