rework identity API selection

Change-Id: I4870cddcb75488b3b6837a15b063aa69cdcc1444
Merge branch 'screen-stop' into dt-test