Only focus the surface on inspector close if range is not null

Change-Id: Ibdaac8dfb44bd5d1159237f52ef2aab0c9b26eb3
Merge "Only focus the surface on inspector close if range is not null"