Merge "Nullify taskbar hotseatView tag when the cell is empty" into sc-dev