Merge "Lockscreen shortcuts: Fix icon pack usage" into cm-11.0