Merge "Mount default encrypted devices at boot"