Toolbox: KK update

comment unmerged settings
translucent/rotation on lockscreen

Change-Id: Id9092e61af9124ef7c459b74f773455286d7af7e