* commit '288f65e3811d17273085bc5c8b553f9ba8833dd4': Fix NPE in FlashlightController Fix stale unlock icon