Merge "Draw background behind contact photo when needed" into lmp-dev