Fix shadow and default assignment warnings

Change-Id: Ibafb4c1b3b915d69713aa8ec7a97cc70ba7b9c2e
Merge topic 'double_slider' into next

9b8f323 Fix shadow and default assignment warnings