Merge "Restrict platform's GhostView and unhide a method needed for a backport"