I wish a solution like [6] were more widely accessible to those without a deep understanding of Android boot system internals. I'd love to be the holder of my own master keys, and the ADB password override feature sounds convenient.