Merge "Fixed flags when button that trigger autofill is clicked." into pi-dev