Merge commit 'f02725e5736db1d390a799291786dd0ede017b1c' * commit 'f02725e5736db1d390a799291786dd0ede017b1c': Avoid calling MediaProvider for MINI_KIND thumbnail unless really necessary.
Merge commit 'f02725e5736db1d390a799291786dd0ede017b1c' * commit 'f02725e5736db1d390a799291786dd0ede017b1c': Avoid calling MediaProvider for MINI_KIND thumbnail unless really necessary.