Merge commit '5df9cdbd37c65c694cfbe159be941a932d474edd' into fta1.31
Merge commit '9a3920d82ed5325245ee8a7a8f2c4fb0c46a35db' into fta1.31
fix crash issue when GeoLocation is not available on the device
Merge branch 'fta1.31'