Pooja: minor refactoring on context data: upload location view
Pooja: adding wait time after collapse on upload locations steps