Merge "Turn off app close flag, Revert back to R implementation." into sc-dev