Merge "Avoid NullPointerException if Location manager is disabled" into main