Merge "Bullet points updated and permission colors are not orange" into ics-mr0