Merge "Fix adding apps to lockscreen targets without explicit icon selection." into cm-10.2