Also renames PopupPanel to MoreKeysPanel Change-Id: I37209a5a8fe7dbba1eef03e3be88ba5253653926
Bug: 4170083 Change-Id: I977d7f6cce08e35fe9bed46fe5f4fdedd1f12e9c