Merge "Update component ids from Winscope to Flicker"