Bug #14 disable pie on lockscreen

Change-Id: I4647aade6292cf49e5372e52d2ecff3bfe4b51f6
Some style fixes
Moar style fixes
Merge remote-tracking branch 'pa/jellybean' into fjpa