Merge "Lockscreen shortcuts: Fix icon pack usage" into cm-11.0
(cherry picked from commit f5b1f98aebc9b0cc0dce17b81bcba24bfebb8dc4)