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

Change-Id: Ib39f71de6ad4e7c44d152b0c135b155dcfbc049e