Revert "Clean up lockscreen target configuration code"

This reverts commit 5ba54bd42f16a0de4a39ac7559cef3e2d316b451.