Warning fixes for shadowing

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

fece498 Warning fixes for shadowing