Merge "fix [3119687] [Maps][4.6.0] Force close in street view" into gingerbread