Merge "Entity header: When screen scrolls, there should be shadow under the header." into pi-dev am: 00a2dcb8f9
am: 976280308d

Change-Id: I055b684dcb5056577e492a6d631c18a186257c4c