Merge "Fix flashlight dim state" into nyc-dev