Merge "Fix bootloops from new zen changed broadcast"