Shadow warning fixes

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

7b4c04b Shadow warning fixes