Merge "Add black frame behind app window" into oc-dr1-dev