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

Change-Id: I9ce5cf5aea7f0fd93fbe24664bbd583d5057d3e6