I think I may have followed the steps incorrect. In any case, did a clean flash and restored apps using SwiftBackup. ROM is smooooth and battery seems to be good as well. Thanks @xLexip!I did a dirty flash of the 23rd May release (plus edition) on top of the April release and I'm facing a bootloop as well.