Merge "QS: Fix missing flashlight tile" into nyc-mr1-dev