Revert "Fixes"

This reverts commit 6958e0feb6cbe157da91b8c0ad208a239d09dce6.
Fixes
Fix error in build caused by Keyguard: Switchable LockScreen Media Controller Screen
Move unlock icons for Gmail and Snapchat from dcm_arrays to cm_arrays