am 6902916b: am 474a3573: Merge "Avoid stripping empty screens if the workspace is still loading (issue 12523285)" into ub-now-lunchbox

* commit '6902916b07e5d2bb879746888deb2a567976b87a':
  Avoid stripping empty screens if the workspace is still loading (issue 12523285)