Merge "Change style of Preview screens (dark borders with "preview" on the bottom)." into nyc-dev