Added support for   hide of popup + auto hide of payment screen when change is due