Merge "Include WMShell protolog in bug-report"