Merge "Update drawer UI (Contact Photos, Baseline Align)" into jb-mr2-dev