I was trying these in the past ever since I found this bug report but then and now it does not help. On an additional note in case this is relevant (although I don't think so): I'm using an lvm-encrypted btrfs root partition, a separate btrfs boot partition and UEFI