Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into pi-dev