Merge \\"Fix flashlight dim state\\" into nyc-dev am: 817c4ca6d4
am: ebd701ee3d

Change-Id: I86d8555927e838e5008bdcde93d3242e5e44de20