Merge "Pass display arg to blank/unblank" into jb-mr1-dev