[Refactored] pet menu component for stability

Change-Id: I48d03180a4902f5ea717a3fcb425312a01c9d756
Merge "[Refactored] pet menu component for stability" into unstable