Merge "Fixing screenshot border asset." into ics-mr1