Merge "Update activeMode when it changes from SF"