Merge "Enabling background protection for back arrow on secondary displays"