Merge "[1/n] Create flag for App Handle Education" into main