Revert "Preferences: Remove useless log"

This reverts commit bed0cb333eacab68fbc0f3c2b5463abb1fc267cb.
Revert "Preferences: Koush steals yachts"

This reverts commit 1671eead0b0c5e02092ffef784a7dea21062eda0

Change-Id: Ia4f4030e5c7b862a66d917a62400da7e9971d8aa
Merge remote branch 'cm/cm-10.1' into cm-10.1