Merge kitkat into kk44
Settings: Add missing break statement

Change-Id: I5779544644dca6a5e564ca0efc20cd3ce325be99
Shorten quick ribbons summary string ocd blah
Merge kitkat into kk44