COMP: Fixing shadow warnings

Change-Id: I44f321e7dadd8d5670e5989c7c0e6984edbc88ea
Merge topic 'drag_n_drop_file_open' into next

3a720c5c COMP: Fixing shadow warnings