Merge "Maybe fix issue #6756472: Share button is not defocusing the shade" into jb-dev