Merge "Fix NPE when passing displayId through handler" into sc-v2-dev