Merge "Remove screen support from devstack completely"