Changes after moving fragments to appui and uicommons