Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into qt-dev am: 1e53d56481

Change-Id: I19ff0f27ad95dc5d80a1c6ae444a91befeba9670