Merge "Move back display ID for ActivityOptions."