From android_frameworks_base you'll want to pick the following commits:
0e846d1a210f9ac937689ac6fa6052decd6090bd
504a3365f429d1f9b3af4b6f4b33196623b82326
4d79213fa35bf68762d3335bcc4d89991b701338
And from Settings you'll want to pick these commits:
0e508d62622c403ab99655a1eb7e14b3fcaa18d8
8ab78d4d79bf124bda5b78dc2bdf9e44df25c2e2
