Resolved lint warnings in list_item.xml
Merged changes into master