Merge "Add shadow to drawer" into jb-mr2-dev