Merge "Change some getCurrent/LastLocation() logic"