Merge "Set a configurable flag for tag dispatch failed toast" am: 2555b60729 am: b4bbcf0525

Change-Id: Ie6f4ebb47d4bd16a79503f5aeaf476cf8b69edfc