Merge "Update divider item decorator to account for view translation" into lmp-dev