Merge "display: Add setSecondaryDisplayStatus API"