Merge "Fixes for FlashlightTile lifecycle"