Merge "Re-enable border sheen (aka border)" into lmp-mr1-ub-dev