Merge branch 'offpa/ThemeEngine'
fix derp in floating notification launch
Merge branch 'offpa/jb43'