Merge "+ correcting shadow visual appearance (b/17610926)" into lmp-dev