Only add an item if it's container is the @ppbar or a folder id.

Change-Id: I0303657ea1d52926a4d8c937d36d473ee9b1c325
Add ability to enable theme compatibility mode on a per-package level.
This will allow a user to override theming of a particular application
that may not look good themed due to color problems or other issues.
[1/2]

Change-Id: Iefd07e06c07831524fe1151740616894319032cb
Merge "Only add an item if it's container is the @ppbar or a folder id." into jellybean-mr1
Merge "Add ability to enable theme compatibility mode on a per-package level. This will allow a user to override theming of a particular application that may not look good themed due to color problems or other issues. [1/2]" into jellybean-mr1