Merge "target: Add display pre/post on/off API"