Merge "Change bug id for new App-to-Web education flag" into main