QS - Port forward: HALO and Screenshot tile

PS2 - Add screenshot delay pref back
PS3 - derp

Change-Id: I6f753ec13b02ec5bd7aa3088be2f3c3078f73cf8
Merge "QS - Port forward: HALO and Screenshot tile" into jb3
Revert "Remove unneeded Halo option"

This reverts commit c8a4d7a768650ed049b016d9707ddf6eb95d49eb.

Change-Id: Iacf168cb0b39b32bd99d156848b5895708014c45
Merge remote-tracking branch 'upstream/jb3' into jb3