Fix shadowed variable warnings.

Change-Id: I565741922b56673d271cb683bf9d7df2b08fe3fb
Merge topic 'refactor_panels' into next

e8446d9 Fix shadowed variable warnings.