Merge "Hide Memory usage UI fields if flag is enabled" into main