Merge "Fixing static instant of OnClickHandler is getting modified at runtime"