Merge "Update "No items" message position to fix invisible bug"