Merge "Lockscreen target fixes" into new-mm6.0