Merge "Autofill: failing testClickCustomButton caused by fullscreen CL"