Merge "Moves snapViewIfNeeded() call to listener on NSSL."