Some merge changes
ListView staying in position after push notifications