A Duress Password would be a good idea, so if you are ever asked to unlock your PC or phone you can use it to provide a sanitized sandbox view of your data or alternatively scramble/delete anything that would compromise you.
This is what TrueCrypt/VeraCrypt and similar software do already: you have two passwords to your encrypted drive, one shows the real data, the other one a whole another fake drive with whatever you put there. Additionally, there is no way to forensically prove that there is hidden encrypted data present and that there's a second layer: you have plausible deniability.