Merge "Migrate kitchen sink to the new drawer activity and update it to use the correct theme"