Merge "Introduce new InflatingEmojiListActivity for JankTest."