Merge "Non-framework location management - remove roaming handling"