Merge "Remove access of DisplayClient from vr_wm"