Add back working lockscreen icon selector

Mix of Slim and DU

Change-Id: I21f1aa15a2ea457e89ff4aec0062ed04e7508634