Merge broodROM Jellybean changes