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