Merge Derp

Change-Id: I2d31dbe98c400f7a274db9b9a3133d3cd8545444
NameSpace Rename

Change-Id: I27b1083269626e59b67abc15f80ee7520d75168e
Revert "PA: Fix Per-app NavBar color"

This reverts commit fbaae9423bb86b84dc71ffcdb09ded8e77ee506f.