Merge "Changes to favorite management screen"