Merge "Update the navigation drawer activated style"