Fix for screen jumping for calendar and the use previous study controls

reviewer: Cy Casada

Issue: GCP-9571