Merge "Fix NPE in FlashlightController" into lmp-dev