Merge "Fix Flashlight tile animation" into mnc-dev