Merge "Update display screen" into sc-dev