Merge "Fix for incorrect proximity alert interval setting"