Merge "screen_ui: Drop the dependency on common.h." am: 738a4258d8 am: 30f2775b37
am: 1875991c71

Change-Id: I6995f59e2a6859d5b5d1e5cdf49c0f19261b829f