Merge "Reduce unnecessary screenshot when display is not on" into udc-dev