Merge commit 'de63adcc2679b75ab5a9fbee7c36338ae1f98afd' * commit 'de63adcc2679b75ab5a9fbee7c36338ae1f98afd': Prevent NPE when doing a fillSpecific layout.
Merge commit 'de63adcc2679b75ab5a9fbee7c36338ae1f98afd' * commit 'de63adcc2679b75ab5a9fbee7c36338ae1f98afd': Prevent NPE when doing a fillSpecific layout.