Port Shake all patch (2/2)
Settings: Enable pref in another instance

If shake to secure is enabled, enable the lock
	and dots preferences

Change-Id: I82a86fac4b2c78177a4b81f483a442911e1865ed