Fix Searchlight showing under NavBar at Lockscreen

Ps 2:  Fix SearchLight at Lockscreen for Realz this time.

Change-Id: Ib6ebcaf84f9f9e88872b634c4939adf56021abc0
Signed-off-by: Zaphod <mwilson@acesappraisal.com>
Merge remote-tracking branch 'upstream/jb-mr1' into jb-mr1