FIX
Removed one more CM class of navring and a small fix in LockScreenTargets.java to match with GlowPadView.java changes

Change-Id: I44c6cdf1213b08bde5757b20afd8bbc50dd59a4c
Lock Screen - Option to hide initial page hints (2/2)

Change-Id: I6185a6a19b75da5f8d87ef4d9ca6b1d8b3fdbb67

Conflicts:

	res/values/cm_strings.xml
Merge branch 'DJL10.2' of github.com:DJL10-2/android_packages_apps_Settings into phone