Merge "screen_ui: Drop the dependency on common.h."