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

Change-Id: I1103ecf7b59faaa49f39369def5ba5570a8280dd