Merge "QS: Fix NPE path inside cell tile." into lmp-dev