Merge "Fix 6021938: Improved target support in lock screen"