am 88b579a1: am 3b83e5bf: (-s ours) am 95137857: Merge "Avoid NPE when getPositionForView() is called on detached view" into mnc-dev * commit '88b579a1':